From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 28 Jun 2011 16:06:54 +0000 (-0400)
Subject: telepathyClient: Add another GAsyncReadyCallback
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8136
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6f515f23277b6d84c773e98382d35fde95b12272;p=gnome-shell.git

telepathyClient: Add another GAsyncReadyCallback

This is better for memory management, and we'll see any errors this
way, which we may eventually want to do something with.

We need to make this change because gjs recently started checking
(allow-none) on callbacks.
---

diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 14e1d4e47..644f893e6 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -149,7 +149,9 @@ Client.prototype = {
                            if (this._tpClient.is_handling_channel(channel)) {
                                // The chat box has been destroyed so it can't
                                // handle the channel any more.
-                               channel.close_async(null);
+                               channel.close_async(function(src, result) {
+                                   channel.close_finish(result);
+                               });
                            }
 
                            delete this._sources[channel.get_object_path()];